Update #NBS-146 with test 4