Enhancements of the test env and test scripts