Fix unit test for 2.2.X (no traits ;))