Add some text to chp. 3 and re-reorder tests