Fix flapping unit test due to use of local timezone, comment back-in uncommented QueryPlanTest