Reworked importing in the tests.