Fixed failing Unit tests
Merge pull request #56 from bhewett/Dev

Fixed failing Unit tests