Start to add test cases for correlation
smaller changes to settings/configs