fixing tests
timestamp
Using Moment JS library to deal with 
timestamps