Changed test files with new syntax