Restructure the tests to use XML as the source rather than property mapper events