Add iterate test cases
Add EntityNotFoundError
Add call test cases
Add mapping test cases
Return None instead of throwing OptimisticLockError