removed logging, resolved mockery warnings