Better test harness
Updated to match the new transact semantics