Finished my JUnit.
Fixed merge conflicts in TransactionTest.