Adding more closure tests