[JBTM-1453] More regression tests