Address code review issues

However, larger issue of mocked objects always returning null
for $this->eventManager() still exists