CHG: Improved unit test