CG: rename unit tests