TYPOC-42: Rewrote data provider to also provide the expected rebuilt expressions