Text nodes plus some more ironing
More work on the test comparator
Some more work