Mend Underscore, WHILE, CALL
Add Tests