Add tests for, fix bugs in SAVE, RETURN