Fix msg part appending
Update tests with new type names