Fix Service test