Add type hints to wrapper and expectation factory
Replace Caller fixture to array access, to not hit FS