[BZ 1110462] adding, updating unit tests