Fix two test results in the new-enabled tests. Add a little cleanup to
ensure tests don't leave anything behind.