fix in unit tests