Fixing CommandIntegrationTest - for now