#653 - rename service, fine-tuning, new tests