test: A few more small cleanups
test: Bring tests under automated lint/style checks