Additions to the test environment