Fixes to the test environment.