Rename some test methods