Added Executor and increased timeout to help with stability (#301)

Added Executor and increased timeout to help with stability (#301) #906