added testcases and finals