fixed dependency on xtest
merged head