Made test-suite work on its own