Changed the tests to not use fixtures