Fixed the tests so they can all be run at once