Add messages testing and group fetch workarounds