Zibi's comment
EJ's comments
Updated settings unit tests