Fixed Tests
Merge pull request #261 from jcadek/master

Fixed Tests