Module is now a closure. Updated tests.