Refactored mock object verification. -Micah