Tweak header population to use the raw routing target. Expand test case to make sure it's retained as message header.