fixing tests for < 2.2