Remove old validation tests (we have new ones)
Fix almost all the things