Upgraded to idgen 2.3. Unit tests failing with 2.4