Repair tests

Also, make the expression of facts consistent.