rearranging test methods for better readability