Matched file names with class names in the tests
Merge pull request #6 from GrahamCampbell/v2-tests

Matched file names with class names in the tests