Revise testings to be compatible with new form change story