[fixed] regressions in unit testé