hop, test cleanup
Merge pull request #135 from kevmoo/master

hop, test cleanup