BS-7159
add tests