fix internal modules for tests