Update testcase + refactor