yrutschle Merge pull request #310 from bket/fix_tests