Update Unit tests
Merge pull request #245 from jerv13/master

Update Unit tests
Merge remote-tracking branch 'upstream/master' into staging