BS-7159
Add unit tests