There was some unnessesary nesting in the tests.