Fix compilation problem in test class; improve build.xml