Merge pull request #287 from mikeh/master

More test workarounds