Added additional tests for tools.