fixed tests and Settings file problems