Adjust description comment, update test and refactor service initialization