Minor test cleanup