BS-11739, add unit tests