activate some tests and remove some