Fixes to broken tests due to core Message refactoring
Introducing api type (public, internal, healthcheck)
Fixed merge error