fixed module loading
fixed tests again