cleanup doesn't look like it returns a boolean. If that is true you can drop the and_return here as mock calls should adhere to what the code is actually doing.