Refactoring
Refactor shell executor
Fix tests