Improvements to Service Integration Test