Reordered the tests to ensure that the previous failures do not occur