use new elasticsearch cluster names during unit tests, trim space