Unit test fix for CTL-191