re ordered tests to match the class