Make tests compatible with unittest discover
Merge pull request #6 from aufau/master

Make tests compatible with unittest discover