a few test fixes
Merge pull request #149 from mikerodonnell89/testStuff

a few test fixes