Completed CallTest. Reverted some of Max's changes because we must not refactor the codebase before we have FULL test coverage.