Moved test submodules to single class with using API