Fix some of the tests so they pass
Stylistic change