etl

42d451dc - Expanded tests and updated make lists