ANT build.xml
some refactoring in test package