going through the tests, fixing the different syntaxes