Rearranged the test functions.