Fixing 10 failures and 6 errors in integration tests.