Testing bug: Fix message selection to work when there is only one message in the scema