additional test updates
cleanup
Merge pull request #2 from cybermerc/master

additional test cleanup