Fixed some syntax in the tests (and test files).