Added transactions to allow tests to run properly at ~> 2.0