Test coverage is not complete after 7702 changes. It's necessary to add more testing to validate these.