[PATCH 0/6] Test and linter fixups