Fix failing test cases related to sun settings
Merge pull request #3320 from Randy-Ma/magn-5563

Fix failing test cases related to sun settings