rearrange test methods