all tests all running properly
Merge pull request #24 from franleplant/fixes

all tests all running properly