function name changed, tests rewrite