Revert TY changes, and make test works again