Merge "TIF: Add test cases for DVR APIs"