restructured settings
fix tests