Fix test failures resulting from 7390dcb4

Added the new configuration option to the expectations of CLI and
ConfigLoader specs.