Some test cleanup
Issue #23: Implemented data_source param