Fixed old test cases that now broke