Fix tests (apart from pluck and fact_names)