Added failing settings race condition test
Simpler fix for race condition in settings