Splitting out from the initial test of both APIs.