Add extra closure tests