Added tests, for the honour of the chapter
Additional test tweaks