Merge "add tests for set_metadata in aggregate"