Apollo 3342

Too many `codeCoverageIgnore*`, I think we need to use this only in exceptional situations. Don't worry about this now, but going forward we should try not to use them.