Transactions and more tests