Add unit test support to collator