Fixes some broken CompMap tests that never should have worked.

see #543