renaming module and moderernizing test framework