Make tests more passing
Merge pull request #2 from jimdotrose/master

Make tests more passing