a number of small improvements to the test environment