[#20522] adding better models for testing