* Merged test tidying and colour printing.