Last fix for CTL-4, all unit tests now succeed