Reverted to old transaction handling, with adjusted unit tests.