EMBRYO-325: more unit tests