Added and revised following TSDR testcase