adding service + more tests