Merge pull request #6216 from gsalgado/convert-integration-tests

Convert integration/api_test:TestGetEvents into a unit test and a CLI test