Update variable settings and tests for lintian fixes