Added tests for short-circuiting.