rework tests after api chenges