Continue refactoring (RMI calls to reuse bean delegators).
Removes unit test only testing mock.