Fix Repeating Transactions, and update tests