- added factory class to services to allow unit test intrumentation