Initial work for the ct tests
28 files changed