Added unit tests for OnCallService. Cleaned up some error handling.