More unit test fixes
Merge remote-tracking branch 'jaggr/master'
Resolve merge conflict
Merge pull request #15 from chuckdumont/master

More unit test fixes