Merge "Fix more UnitTests for databases that do not use integer timestamps"