Merge pull request #89 from zvirusz/patch-5

Fix includes inside function arguments, resolves #88
swap some expected/actual arguments in tests
Merge pull request #90 from zvirusz/patch-6

Swap some expected/actual arguments in tests
allow dynamic arguments count in ClassProxy