Add integration tests from 2.2.0