Remove unused variable
Fix test warnings