Arrange test suite tests in better order