Modified queries to reflect latest harvest schema
Modified test data to reflect harvest schema