Fix test failures caused by switch to Adaptive Message IDs