NXP-15145: adapt tests to select items ordering fixes