Refactoring: dropping CouldNotVerifyCallError