Cleanup testing references

Change-Id: I4d0dda440ed239c4291c52cde5743e6cb592cc2a
3 files changed