diff --git a/src/Composer/DependencyResolver/Transaction.php b/src/Composer/DependencyResolver/Transaction.php
index 6496327ff..04e2e966d 100644
--- a/src/Composer/DependencyResolver/Transaction.php
+++ b/src/Composer/DependencyResolver/Transaction.php
@@ -12,14 +12,10 @@
 
 namespace Composer\DependencyResolver;
 
-use Composer\DependencyResolver\Operation\MarkAliasUninstalledOperation;
-use Composer\DependencyResolver\Operation\UninstallOperation;
 use Composer\Package\AliasPackage;
 use Composer\Package\Link;
 use Composer\Package\PackageInterface;
 use Composer\Repository\PlatformRepository;
-use Composer\Repository\RepositoryInterface;
-use Composer\Semver\Constraint\Constraint;
 
 /**
  * @author Nils Adermann <naderman@naderman.de>
@@ -298,7 +294,7 @@ class Transaction
     {
         $uninstOps = array();
         foreach ($operations as $idx => $op) {
-            if ($op instanceof UninstallOperation) {
+            if ($op instanceof Operation\UninstallOperation) {
                 $uninstOps[] = $op;
                 unset($operations[$idx]);
             }
diff --git a/tests/Composer/Test/DependencyResolver/TransactionTest.php b/tests/Composer/Test/DependencyResolver/TransactionTest.php
new file mode 100644
index 000000000..6cde5d5d0
--- /dev/null
+++ b/tests/Composer/Test/DependencyResolver/TransactionTest.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Test\DependencyResolver;
+
+use Composer\DependencyResolver\Transaction;
+use Composer\Package\Link;
+use Composer\Test\TestCase;
+
+class TransactionTest extends TestCase
+{
+    public function setUp()
+    {
+    }
+
+    public function testTransactionGenerationAndSorting()
+    {
+        $presentPackages = array(
+            $packageA = $this->getPackage('a/a', 'dev-master'),
+            $packageAalias = $this->getAliasPackage($packageA, '1.0.x-dev'),
+            $packageB = $this->getPackage('b/b', '1.0.0'),
+            $packageE = $this->getPackage('e/e', 'dev-foo'),
+            $packageEalias = $this->getAliasPackage($packageE, '1.0.x-dev'),
+            $packageC = $this->getPackage('c/c', '1.0.0'),
+        );
+        $resultPackages = array(
+            $packageA,
+            $packageAalias,
+            $packageBnew = $this->getPackage('b/b', '2.1.3'),
+            $packageD = $this->getPackage('d/d', '1.2.3'),
+            $packageF = $this->getPackage('f/f', '1.0.0'),
+            $packageFalias1 = $this->getAliasPackage($packageF, 'dev-foo'),
+            $packageG = $this->getPackage('g/g', '1.0.0'),
+            $packageA0first = $this->getPackage('a0/first', '1.2.3'),
+            $packageFalias2 = $this->getAliasPackage($packageF, 'dev-bar'),
+        );
+
+        $packageD->setRequires(array(
+            'f/f' => new Link('d/d', 'f/f', $this->getVersionConstraint('>', '0.2'), 'requires'),
+            'g/provider' => new Link('d/d', 'g/provider', $this->getVersionConstraint('>', '0.2'), 'requires'),
+        ));
+        $packageG->setProvides(array('g/provider' => new Link('g/g', 'g/provider', $this->getVersionConstraint('==', '1.0.0'), 'provides')));
+
+        $expectedOperations = array(
+            array('job' => 'uninstall', 'package' => $packageC),
+            array('job' => 'uninstall', 'package' => $packageE),
+            array('job' => 'install', 'package' => $packageA0first),
+            array('job' => 'update', 'from' => $packageB, 'to' => $packageBnew),
+            array('job' => 'install', 'package' => $packageG),
+            array('job' => 'install', 'package' => $packageF),
+            array('job' => 'markAliasInstalled', 'package' => $packageFalias1),
+            array('job' => 'markAliasInstalled', 'package' => $packageFalias2),
+            array('job' => 'install', 'package' => $packageD),
+            array('job' => 'markAliasUninstalled', 'package' => $packageEalias),
+        );
+
+        $transaction = new Transaction($presentPackages, $resultPackages);
+        $this->checkTransactionOperations($transaction, $expectedOperations);
+    }
+
+    protected function checkTransactionOperations(Transaction $transaction, array $expected)
+    {
+        $result = array();
+        foreach ($transaction->getOperations() as $operation) {
+            if ('update' === $operation->getJobType()) {
+                $result[] = array(
+                    'job' => 'update',
+                    'from' => $operation->getInitialPackage(),
+                    'to' => $operation->getTargetPackage(),
+                );
+            } else {
+                $result[] = array(
+                    'job' => $operation->getJobType(),
+                    'package' => $operation->getPackage(),
+                );
+            }
+        }
+
+        $this->assertEquals($expected, $result);
+    }
+}