Adjust timestamp position and test fixing