updated tests and settings