moved settings files to appropriate heuristics, removed global settings, updated tests, pep8 fixed