XD-1614 Address review comments

- Appropriate logic to assign UTC endtime and assertion