Clean up some of the Impl code and ensure test method executor waits for deployment to finish before running