updated service tests
converted factories into services
converte back to factories
added unit tests for collections and streak counter
unit tests are now passing with injection