Fixed module imports.
Currently 5 nostests, all of which pass.