Fix and cleanup helper function, and remove two settings from cfg test list