Add test for short circuiting