Fix some settings and try to fix (selenium) tests