Fixing integration tests
Minor changes