Remove unused imports
ISPN-3717 WIP non-indexed query
ISPN-4319 WIP

Remove unnecessary empty class (ReadMessageContext).
Add 'order by' to ensure test stability