XPATH: Fixed some message flow issues and added test for A.1 variations.