PIM-3309: improved behats
PIM-3309: improved behats + fix unicity bug