Merge "Update testcase model for Test DB"