Simplify test.
Rename service methods