Add time format
Use UTC time in test
Merge master