Merge "Fixing TimeTest"