Cleaned up a bit and test are green again.
Template formatting made a bit nicer.