Merge pull request #334 from gavincornwell/master

Fixing test failures