BS-9839, unit tests coverage