BAC-1265 adding unit tests