Corrected handling of timestamps, now scan test passes