Minor test cleanup for CAPEDWARF-66
Fix Logging tests