fix: the last merge and unit tests