jcheng26 ssong55: fixed test cases