Fix for timestamp and user.id test results