Style tweak
Remove outdated comment
Remove some test warnings