Fixing test failures
Merge pull request #465 from ambiata/topic/fix

Fixing test failures