Modified structure to match test structure

Updated a few function names to match the test structure and made the
test compatible with the current design of the module class.