Integrate new common synced setting class
Update test