Fixed all broken test cases.