4.2.2 Unit test fix