Fix integration test
Cleanup