Expression chooser: now works :D
Preserve order of expression in chooser
Template .not now used expression chooser
Expression chooser impl for tests
Fix tests after expr chooser