Updated tests to new syntax