Updated tests.py and ingesterapi_wrapper.py to handle data sources better