clean up code in Executor and Storage, TestExecutor implemented