Updating Tests to unblock CLI team