The other concern was that the upstream tests should actually run at build time. This patch addresses that concern.
The other concern was that the upstream tests should actually run at build time. This patch addresses that concern.