changed timestamp test to work with millis
grunt compiled
changed fix to be more compatible with test, and less code