fixing tests
Merge pull request #16 from chrismcv/master

fixing tests