Cleanup formatting, add to ServiceOffering integration test.