Bring CLI tests in line with integration tests