Add type hints to wrapper and expectation factory
Replace Caller fixture to array access, to not hit FS
Merge pull request #175 from MarcelloDuarte/master

Amend to reflect PR feedback