test timestamps and fix them

also reformatting