Use unique class names to match filenames
Merge some similar tests to a single file