Cleaned up integration test slightly