cleaned up evaluation of head item in and, added test to ensure short circuiting