Small changes into service files. Also changed testing mechanism for Clash.