fix some imports to make tests work again