Fixed the test setup

All the tests can now be run in a single test run