Combined config files, new test command