refactor tests after new release2