removed deprecated testcases
resolve merge conflict