cleanfix
change build.xml and add dependencies for tests