Don't test for NonLocalNameException, since I killed it.
Allow for the failure of getServiceInfo(). Not sure why it's happening,
though.
Remove the comment about the test programs.
Untab the test programs.