@jzoldak, @wedaly: what's the right way to test this?