changed default argument of expects
removed expects_str
modified
Merge branch 'refactoring'
parse lambda syntax