All templates now updating correctly, tests passing