Removed unneeded sample
commented out IServiceProvider impl
Updated test
More work on the proxy/impl
Fixed one or two more bugs