Add in service registry tests and a Fake Cloud impl.

Fix a couple of problems with the lb merge.
Did you cut instead of copy? :)