fix closure tests