Merge "Change build targets for settings tests"