Add tests.
remove some accidentally committed stuff.
Use new service injection style.