tighten up agent info mocks