Fixed broken test cases in focal.