Time & TimeTest update