updated concerns with some failing tests
removed unused mockgen