Fix more UnitTests for databases that do not use integer timestamps

Change-Id: I6f8b19aa6e6a9efc3320bb18fa8c7ec8b72a0c17
Merge "Fix more UnitTests for databases that do not use integer timestamps"