Correction for deadlocked CT test cases, fixes #225