Merge pull request #104 from nakengelhardt/more_tests