Add order to potential_buyers_ids/Refactor related specs + Notifier new_message fix