Merge "Update settings tests to use new constructor."