BS-9613: fix validation on multiple (remove unused case) and add unit
tests