Fixed typos in timestamp generation, added tests to check timestamps