fixed for settings and tests