Testing fixes on TR