Fixing unit tests broken due to explain plan changes