modifications to test_tool to be more thorough