Added an Executor wrapper
Added more future integration tests