More test cleanup to match #14.