GH-13: fixing imports in tests.