Tweaks to fix test issues
Updated Changes [ci skip]