Merge Integration Test into Master