WyCS: fixed several additional test cases.