Implemented closure arguments
Closure return, arguments fixed. Added proper tests