done with: #162 Waiting for another PR to become in place for making environment.update return code possible to assert.
__ret -> result
rebased: omaciel's last changes
_ret => result
Merge pull request #164 from gkhachik/pr162

pr#162 + fix in __ret => result