BS-6825
unit tests