Fixed unit test bug with changes to GenericServices