diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..270f331
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+language: php
+php:
+  - 5.3
+  - 5.4
+
+script: phpunit ./
\ No newline at end of file
diff --git a/AltoRouter.php b/AltoRouter.php
index b0773e7..c8ee198 100644
--- a/AltoRouter.php
+++ b/AltoRouter.php
@@ -2,9 +2,9 @@
 
 class AltoRouter {
 
-	private $routes = array();
-	private $namedRoutes = array();
-	private $basePath = '';
+	protected $routes = array();
+	protected $namedRoutes = array();
+	protected $basePath = '';
 
 	/**
 	 * Set the base path.
@@ -73,7 +73,7 @@ class AltoRouter {
 				if(isset($params[$param])) {
 					$url = str_replace($block, $params[$param], $url);
 				} elseif ($optional) {
-					$url = str_replace($block, '', $url);
+					$url = str_replace($pre . $block, '', $url);
 				}
 			}
 
diff --git a/AltoRouterTest.php b/AltoRouterTest.php
new file mode 100644
index 0000000..f40176b
--- /dev/null
+++ b/AltoRouterTest.php
@@ -0,0 +1,267 @@
+<?php
+
+require 'AltoRouter.php';
+
+class AltoRouterDebug extends AltoRouter{
+	
+	public function getNamedRoutes(){
+		return $this->namedRoutes;
+	}
+	
+	public function getRoutes(){
+		return $this->routes;
+	}
+	
+	public function getBasePath(){
+		return $this->basePath;
+	}
+}
+
+/**
+ * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2013-07-14 at 17:47:46.
+ */
+class AltoRouterTest extends PHPUnit_Framework_TestCase
+{
+	/**
+	 * @var AltoRouter
+	 */
+	protected $router;
+
+	/**
+	 * Sets up the fixture, for example, opens a network connection.
+	 * This method is called before a test is executed.
+	 */
+	protected function setUp()
+	{
+		$this->router = new AltoRouterDebug;
+	}
+
+	/**
+	 * Tears down the fixture, for example, closes a network connection.
+	 * This method is called after a test is executed.
+	 */
+	protected function tearDown()
+	{
+	}
+
+	/**
+	 * @covers AltoRouter::setBasePath
+	 */
+	public function testSetBasePath()
+	{
+		$basePath = $this->router->setBasePath('/some/path');
+		$this->assertEquals('/some/path', $this->router->getBasePath());
+		
+		$basePath = $this->router->setBasePath('/some/path');
+		$this->assertEquals('/some/path', $this->router->getBasePath());
+	}
+
+	/**
+	 * @covers AltoRouter::map
+	 */
+	public function testMap()
+	{
+		$method = 'POST';
+		$route = '/[:controller]/[:action]';
+		$target = function(){};
+		
+		$this->router->map($method, $route, $target);
+		
+		$routes = $this->router->getRoutes();
+		
+		$this->assertEquals(array($method, $route, $target, null), $routes[0]);
+	}
+
+	/**
+	 * @covers AltoRouter::map
+	 */
+	public function testMapWithName()
+	{
+		$method = 'POST';
+		$route = '/[:controller]/[:action]';
+		$target = function(){};
+		$name = 'myroute';
+		
+		$this->router->map($method, $route, $target, $name);
+		
+		$routes = $this->router->getRoutes();
+		$this->assertEquals(array($method, $route, $target, $name), $routes[0]);
+		
+		$named_routes = $this->router->getNamedRoutes();
+		$this->assertEquals($route, $named_routes[$name]);
+		
+		try{
+			$this->router->map($method, $route, $target, $name);
+			$this->fail('Should not be able to add existing named route');
+		}catch(Exception $e){
+			$this->assertEquals("Can not redeclare route '{$name}'", $e->getMessage());
+		}
+	}
+
+
+	/**
+	 * @covers AltoRouter::generate
+	 */
+	public function testGenerate()
+	{
+		$params = array(
+			'controller' => 'test',
+			'action' => 'someaction'
+		);
+		
+		$this->router->map('GET', '/[:controller]/[:action]', function(){}, 'foo_route');
+		
+		$this->assertEquals('/test/someaction',
+			$this->router->generate('foo_route', $params));
+		
+		$params = array(
+			'controller' => 'test',
+			'action' => 'someaction',
+			'type' => 'json'
+		);
+		
+		$this->assertEquals('/test/someaction',
+			$this->router->generate('foo_route', $params));
+		
+	}
+
+	public function testGenerateWithOptionalUrlParts()
+	{
+		$this->router->map('GET', '/[:controller]/[:action].[:type]?', function(){}, 'bar_route');
+		
+		$params = array(
+			'controller' => 'test',
+			'action' => 'someaction'
+		);
+		
+		$this->assertEquals('/test/someaction',
+			$this->router->generate('bar_route', $params));
+		
+		$params = array(
+			'controller' => 'test',
+			'action' => 'someaction',
+			'type' => 'json'
+		);
+		
+		$this->assertEquals('/test/someaction.json',
+			$this->router->generate('bar_route', $params));
+	}
+	
+	public function testGenerateWithNonexistingRoute()
+	{
+		try{
+			$this->router->generate('nonexisting_route');
+			$this->fail('Should trigger an exception on nonexisting named route');
+		}catch(Exception $e){
+			$this->assertEquals("Route 'nonexisting_route' does not exist.", $e->getMessage());
+		}
+	}
+	
+	/**
+	 * @covers AltoRouter::match
+	 * @covers AltoRouter::compileRoute
+	 */
+	public function testMatch()
+	{
+		$this->router->map('GET', '/foo/[:controller]/[:action]', 'foo_action', 'foo_route');
+		
+		$this->assertEquals(array(
+			'target' => 'foo_action',
+			'params' => array(
+				'controller' => 'test',
+				'action' => 'do'
+			),
+			'name' => 'foo_route'
+		), $this->router->match('/foo/test/do', 'GET'));
+		
+		$this->assertFalse($this->router->match('/foo/test/do', 'POST'));
+		
+		$this->assertEquals(array(
+			'target' => 'foo_action',
+			'params' => array(
+				'controller' => 'test',
+				'action' => 'do'
+			),
+			'name' => 'foo_route'
+		), $this->router->match('/foo/test/do?param=value', 'GET'));
+		
+	}
+	
+	public function testMatchWithFixedParamValues()
+	{
+		$this->router->map('POST','/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do');
+		
+		$this->assertEquals(array(
+			'target' => 'usersController#doAction',
+			'params' => array(
+				'id' => 1,
+				'action' => 'delete'
+			),
+			'name' => 'users_do'
+		), $this->router->match('/users/1/delete', 'POST'));
+		
+		$this->assertFalse($this->router->match('/users/1/delete', 'GET'));
+		$this->assertFalse($this->router->match('/users/abc/delete', 'POST'));
+		$this->assertFalse($this->router->match('/users/1/create', 'GET'));
+	}
+	
+	public function testMatchWithServerVars()
+	{
+		$this->router->map('GET', '/foo/[:controller]/[:action]', 'foo_action', 'foo_route');
+		
+		$_SERVER['REQUEST_URI'] = '/foo/test/do';
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		
+		$this->assertEquals(array(
+			'target' => 'foo_action',
+			'params' => array(
+				'controller' => 'test',
+				'action' => 'do'
+			),
+			'name' => 'foo_route'
+		), $this->router->match());
+	}
+	
+	public function testMatchWithOptionalUrlParts()
+	{
+		$this->router->map('GET', '/bar/[:controller]/[:action].[:type]?', 'bar_action', 'bar_route');
+		
+		$this->assertEquals(array(
+			'target' => 'bar_action',
+			'params' => array(
+				'controller' => 'test',
+				'action' => 'do',
+				'type' => 'json'
+			),
+			'name' => 'bar_route'
+		), $this->router->match('/bar/test/do.json', 'GET'));
+		
+	}
+	
+	public function testMatchWithWildcard()
+	{
+		$this->router->map('GET', '/a', 'foo_action', 'foo_route');
+		$this->router->map('GET', '*', 'bar_action', 'bar_route');
+		
+		$this->assertEquals(array(
+			'target' => 'bar_action',
+			'params' => array(),
+			'name' => 'bar_route'
+		), $this->router->match('/everything', 'GET'));
+		
+	}
+	
+	public function testMatchWithCustomRegexp()
+	{
+		$this->router->map('GET', '@^/[a-z]*$', 'bar_action', 'bar_route');
+		
+		$this->assertEquals(array(
+			'target' => 'bar_action',
+			'params' => array(),
+			'name' => 'bar_route'
+		), $this->router->match('/everything', 'GET'));
+		
+		$this->assertFalse($this->router->match('/some-other-thing', 'GET'));
+		
+	}
+}