test(datepicker): Revert changes and fix underscore