clay: Merge manually @leto's tests from #485 This uses the new Clay code. As you can see, the diff is minimal... It works!