Fixed test
Merge pull request #25 from SamLebarbare/master

Fixed tests