Merge pull request #16 from kevmoo/master

A lot of test cleanup