refactor tests after new release1