Merge pull request #160 from mikeh/master

Fix tests