Move tests to separated testcase