BLD-506: Update behavior of start/end time fields.
Fix indentation.
Fix acceptance test.
Add fixes.