Lens -> Descriptor
Cleanup services in availability test
Fix Elasticsearch availability check