BS-9967, update unit tests