Add testcases, rename testfiles