Slight refactor to accomodate Nose's test discovery.
Merge pull request #41 from lyndsysimon/feature/nose_compatibility

Slight refactor to accomodate Nose's test discovery.