WyCS: added various test cases and attempting to decide how to go forward.