Fixes to broken tests due to core Message refactoring