Merge "Call Database::timestamp in some tests"