Ideally, yes, but the aggregation with self contact test predates the aggregation test, and has never been moved.