cleanup
fix test
refactoring
add script_path as operation parameter