Update test cases to be able to pass for tomorrow