Fixed tests and settings