add tests and settings changes