Touch ups to integration test