only bring @wch tests from #487. It seems the issue was otherwise fixed. closes #487