Bug 840322 - Settings unresponsive for a bit after startup r=cjones

Fix tests