Added monkey-patching for coverage/test