Remove further references to config.cfg, fix new_kitchen tests