Fix up the hold save and the testcases