Update ETL
Updated tests for debugging/benchmarking