minor test cleanup