Refactor code without failing any tests