Moved tests into static method of new class called comap.