diff --git a/tests/AssetTest.php b/tests/AssetTest.php
index abfd94b6..50397d96 100644
--- a/tests/AssetTest.php
+++ b/tests/AssetTest.php
@@ -20,7 +20,7 @@ public function testAssetManagerMagicallyCallsDefaultContainer()
 		$mock = $this->getMockBuilder('Laravel\\Asset_Container')->disableOriginalConstructor()->getMock();
 
 		$mock->expects($this->any())->method('styles')->will($this->returnValue('styles'));
-
+		
 		$asset->containers['default'] = $mock;
 
 		$this->assertEquals($asset->styles(), 'styles');
@@ -63,7 +63,7 @@ public function assetProvider()
 		);
 	}
 
-	public function testStylesCanBeRetrieved()
+	public function testAllStylesCanBeRetrievedViaStylesMethod()
 	{
 		$container = new Laravel\Asset_Container('default', new HTMLAssetStub);
 
@@ -74,7 +74,7 @@ public function testStylesCanBeRetrieved()
 		$this->assertEquals($container->styles(), 'css/reset.css media:allcss/jquery.css media:all');
 	}
 
-	public function testScriptsCanBeRetrieved()
+	public function testAllScriptsCanBeRetrievedViaScriptsMethod()
 	{
 		$container = new Laravel\Asset_Container('default', new HTMLAssetStub);
 
@@ -85,6 +85,43 @@ public function testScriptsCanBeRetrieved()
 		$this->assertEquals($container->scripts(), 'js/jquery-ui.js js/jquery.js test:value');
 	}
 
+	public function testAssetsAreSortedBasedOnDependencies()
+	{
+		$container = $this->getContainer();
+
+		$container->script('jquery', 'js/jquery.js', array('jquery-ui'));
+		$container->script('jquery-ui', 'js/jquery-ui.js');
+
+		$scripts = $container->scripts();
+
+		$this->assertTrue(strpos($scripts, 'js/jquery-ui.js') < strpos($scripts, 'js/jquery.js'));
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testAssetsCannotBeDependentOnSelf()
+	{
+		$container = $this->getContainer();
+
+		$container->script('jquery', 'js/jquery.js', array('jquery'));
+
+		$container->scripts();
+	}
+
+	/**
+	 * @expectedException Exception
+	 */
+	public function testAssetDependenciesCannotBeCircular()
+	{
+		$container = $this->getContainer();
+
+		$container->script('jquery', 'js/jquery.js', array('jquery-ui'));
+		$container->script('jquery-ui', 'js/jquery-ui.js', array('jquery'));
+		
+		$container->scripts();
+	}
+
 	private function getContainer()
 	{
 		return new Laravel\Asset_Container('default', Laravel\IoC::resolve('laravel.html'));