simplify some test class structure
Merge pull request #205 from reaperhulk/simplify-tests

Simplify some test class structure