Rearranged the test cases for easier reuse