Renaming some test methods