code cleanup in company tests
more code cleanup in company tests
code cleanup in agent tests
code cleanup in firehose tests
fixing issues with company tests