[PATCH] Tests from phase1 renamed