ralouphie Merge pull request #9 from peter279k/test_enhancement