add new tests, remove debug prints
Merge pull request #24 from CharlesGust/cleanup2_cmg

add new tests, remove debug prints