PE-1561 - Fix unit tests.