Fixed issue with Time tests caused by later decisions.