fix test suite, run tests for both 2.1 and 2.2