Reorganized some test methods