fixed import warnings
removed mock dependency