Templates fully replaced; all tests except Signatures work