use smaller xml in tests
code cleaning