merge tests (monitoring & applications) & fix discovery behavior