- Updated mock tests. - Refactored to get more coverage. - Minor changes to normalize error reporting.