Cleaning up integration test code