Merge pull request #42 from c00w/master

Testsuite cleanups