Does this have any possible side effect @btm ? Slightly concerned about the increasing test scope when we make that change.. If yeah, then we should probably take care of it in a separate ticket.