fixed the testcases to use the new names