ENH cleaning up the tests syntax