CHG: Improved unit tests