More unit tests and cleanup. Executin service will be tough to finish testing without heavy mocking