cleanup tests, make tests work, use better service injection

kind of a big commit since this is till in heavy development, after this
commits should be more focused