Merge "Add Trove (database) Flavor API Tests"