Clean up some unused test code
Merge pull request #56 from playsign/unused-cleanup

Clean up some unused test code