test
remove test, add timestamp and timestamp in millisecond