update test classes and xml configuration...