fixed all tests after jdo move