Reenable some tests