WYCS: tweaks to test harness so that it runs again.