Work to support new reference-designs tests