Fixed module loader tests + code that should not have been commented