Fixed imports

Last one. I need a better testing method...