more tests and a fix to compmap. Also got python 2.6 compat back