Fixed broken test cases.