fixed import errors from backported changes in unit tests