 
         history.insertOrUpdatePlace(site.asPlace(), modified: 1234567890).value
 
-        let local = SiteVisit(site: site, date: Timestamp(1000 * 1437088398461), type: VisitType.Link)
+        let ts: MicrosecondTimestamp = 1437088398461000
+        let local = SiteVisit(site: site, date: ts, type: VisitType.Link)
         XCTAssertTrue(history.addLocalVisit(local).value.isSuccess)
     }
 }

            let site = Site(url: "http://s\(0)ite\(0)/foo", title: "A \(0)")
            site.guid = "abc\(0)def"
            for i in 0...20 {
                addVisitForSite(site, intoHistory: history, from: .Local, atTime: Timestamp(1439088398461 + (1000 * i)))
            }
            return succeed()
        }

import Foundation
import Shared
import XCTest

func advanceTimestamp(timestamp: Timestamp, by: Int) -> Timestamp {
    return timestamp + UInt64(by)
}

func advanceMicrosecondTimestamp(timestamp: MicrosecondTimestamp, by: Int) -> MicrosecondTimestamp {
    return timestamp + UInt64(by)
}

extension Site {
    func asPlace() -> Place {
