moving in the tests from local prototype: 2.2.*