Fixes for test fails
Merge pull request #86 from larowlan/test-fails

Fixes for test fails