improve findAndModify() unit tests