Fixing the Agent unit test compilation issues

Change-Id: I9ecce71242829d61b1f07e85fe571211b648e53e