Merge pull request #60 from akshay-harale/2.2

Code re-factoring and actions function test cases.