CHG: simplifying tests body