Update imports to make unittests work properly