Merge pull request #57 from onkar-dhuri/2.2

Temporary fix failing test cases because of latest changes
Merge pull request #58 from onkar-dhuri/2.2

Fixed failing test cases for Actions/Functions.