Fix Timestamp issue, minor fix on test