Merge pull request #175 from jix/more-test-improvements