Fix failing tests due to changes in message serialization; missing licence
information sweep up