Moved POJO types to mock
Removed message-types