Fixing integration tests for distribution