Minor test cleanup for CAPEDWARF-66