Refactored and cleaned up DatastreamServiceTest