CFY-959 start making way for passing suite specific configuration