Fixing closures
Updating tests