Better coverage of configuration