Adding test for the new short-circuit path.