More lint improvements in tests