Merge pull request #733 from chrisglass/add-more-tests