start to generalise xml search in test system
reorder test setup
generalise tests across levels
fix typo