Due to not enough time service is going to be merged without test. Add tests and keep coverage about 80 %