Fixed broken test cases