Fix module imports in tests.
Eclipse didn't seem to care about these... or I never noticed them failing. Weird.