Rename methods in effort to use consistent spelling of 'memberservice'.
Refactor unittests.