Adding unit test
Adding message converter from v21 to v22