WYCS: Working through looking for test cases which now pass.