Removed compiler warnings for testcases
Added tenant model