Merge pull request #481 from danvk/fix-tests

No match.