BS-2842
Add tests