XXX remove some tests