Fixed test failure due to time zones, removed commented-out test