More dig tests
small lint fix
code cleanup
Merge pull request #10366 from rallytime/dig_test

More dig tests