Added Davy's example as the short-circuiting test.