small refactor. apo.xml in tests