Fix broken html comments from layout
Tidy up registration, make tests pass