Add test and fix some bugs in Prime_enumset.
Add Prime_enummap.
Fix use of compare in Prime_enummap and Prime_enumset.