Fix closure tests