added support for functions and vars
unittest update