Some fixes to the test environment.