test environment + test_tools corrections