Fixed a couple more bugs and extended TestTransactionSave test.