Enable autotest.
Don't barf after files are removed.
Minor renaming.