Reenable some failing tests