Fixed broken imports in tests