Update tests to reflect last RRD connector changes
Fix various linting errors