Fix tests to work with latest version of closure