Added tests for tools