Fixing MessageServiceIT