refactored settings
tests added