[TASK] Changed the order for creating the timestamp

This should prevent runtime issues when the test is executed
Merge pull request #3 from monofone/test-fix

[TASK] Changed the order for creating the timestamp