WyC: going through the test inputs updating them to use the non-$ format for return values.