Load tool changes/fixes
fixes for loadTool and tests