Just discussed with @richardcloudsoft - we think option 2 (i.e. the test entity).