removed a duplicate test, cleaned up some others
Merge pull request #628 from bmaddy/test-cleanup

removed a duplicate test, cleaned up some others