Code

Merge branch 'jk/config-test-cleanup'