Simplify tests by using submodules
Modernize with a class