spruce up tests
Merge pull request #4 from apanzerj/apanzerj/current_wip

spruce up tests