WyC: finished tidying up test cases; removed old ones and replaced with the new.