Refactor testing, hook in kolon-ish parser, which isn't quite done yet