Test lookup with message_id; refactor givens/whens