Bugfix if string value is a name of function
Add new tests