Separated the tests to allow better performance tracking