replaced spy with 2 spys

Change-Id: I8c536869c45ecaf4f9d2d928e9e40e84a7de6d83