All tests fixed
Merge pull request #9 from wvmitchell/fixing_tests

All tests fixed