Remove lots of legacy test code from remote.py and services.py.
Merge pull request #886 from jmaas/master

Remove lots of legacy test code from remote.py and services.py.