am 60898820: Fixed the scope of database query for calendar tests

* commit '60898820389ff77699ecc7c33656ac430f57fdf9':
  Fixed the scope of database query for calendar tests