Merge test config into suite config, instead of having two distinct configs