etl

3cb1c956 - Fix tests after addition of ETL_NODISCARD