Minor test cleanup.