all changes made besdies splitting test methods