Rewrote the call model unit tests