Fixup testing cmake setup
Fixup for end_map