PE-1632 - Improved unit tests.