Merge pull request #2 from AArnott/master

Fixes test discovery bug #1