cleaning up test helper extensions a little
some new view models, service methods, tests