Fixing AS integration test failures