Final test and jade templates SHOULD all be fine now