Change tests to match new syntax