Fix unarchived test cases