Fix unit test errors
Fix unit test errors
Merge pull request #2 from wmtan/unitTestFixes

Unit test fixes