fixing the rest of the tests to use the new syntax