Also pimp test environment so the test-suite can run