Fix remaining lint issues #1665

Job	Run time
test (oldstable, macos-latest)	8m 16s
test (stable, ubuntu-latest)	7m 51s
test (oldstable, ubuntu-latest)	8m 29s
test (stable, macos-latest)	8m 33s
	33m 9s

Provide feedback