Removed old settings file, updated tests, coverage at 97%