Refactor: Nicer var names
Make it easier to get what was called for mock errors.
Throw away some of the things from meck we are not using.