Extend and fix R4T unit test