Updated tests for relocated xml handlers