Added module loader and tests