More test cleanup, temporarily disable "bad file" tests.