Reactivate some tests