CB-7663 - prep for unit tests