Reactivated many unittests; still wip