V2.1 tests fix