was losing tuple information again -- tests failing