Merge pull request #736 from chrisglass/more-tests-2