more on tests, mainly
Merge pull request #40 from evildmp/tests-mainly

more on tests, mainly