diff --git a/.travis.yml b/.travis.yml
index 605785e..07dd43f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,40 @@
 language: php
 php:
-    - 5.3.3
+    - 5.3
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
     - hhvm
 
 matrix:
     allow_failures:
         - php: hhvm
 
-script: vendor/bin/tester tests -s -c tests/php-unix.ini
+script:
+    - vendor/bin/tester tests -s -p php $coverage
+    - php code-checker/src/code-checker.php -d src
 
 after_failure:
     # Print *.actual content
     - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
 
 before_script:
-    # Install Nette Tester
-    - composer install --no-interaction --dev --prefer-source
+    # Install Nette Tester & Code Checker
+    - travis_retry composer install --no-interaction --prefer-dist
+    - travis_retry composer create-project nette/code-checker code-checker ~2.5 --no-interaction
+    - if [ $TRAVIS_PHP_VERSION == "7.0" ]; then coverage="-p phpdbg --coverage ./coverage.xml --coverage-src ./src"; fi
+
+after_script:
+    # Report Code Coverage
+    - >
+      if [ "$coverage" != "" ]; then
+      wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
+      && php coveralls.phar --verbose --config tests/.coveralls.yml
+      || true; fi
+
+sudo: false
+
+cache:
+    directories:
+        - $HOME/.composer/cache
diff --git a/composer.json b/composer.json
index d255b59..5b1f6c3 100644
--- a/composer.json
+++ b/composer.json
@@ -1,23 +1,24 @@
 {
 	"name": "nette/tokenizer",
 	"description": "Nette Tokenizer",
-	"homepage": "http://nette.org",
+	"homepage": "https://nette.org",
 	"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
 	"authors": [
 		{
 			"name": "David Grudl",
-			"homepage": "http://davidgrudl.com"
+			"homepage": "https://davidgrudl.com"
 		},
 		{
 			"name": "Nette Community",
-			"homepage": "http://nette.org/contributors"
+			"homepage": "https://nette.org/contributors"
 		}
 	],
 	"require": {
 		"php": ">=5.3.1"
 	},
 	"require-dev": {
-		"nette/tester": "~1.0"
+		"nette/tester": "~1.7",
+		"tracy/tracy": "^2.3"
 	},
 	"conflict": {
 		"nette/nette": "<2.2"
diff --git a/contributing.md b/contributing.md
new file mode 100644
index 0000000..860882b
--- /dev/null
+++ b/contributing.md
@@ -0,0 +1,27 @@
+How to contribute & use the issue tracker
+=========================================
+
+The issue tracker is the preferred channel for bug reports, features requests
+and submitting pull requests, but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for personal support requests (use
+  [Nette forum](https://forum.nette.org) or [Stack Overflow](http://stackoverflow.com)).
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+* Use the GitHub **issue search** &mdash; check if the issue has already been
+   reported.
+
+A good **bug report** shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report.
+
+**Feature requests** are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature.
+
+Nette welcomes **pull requests**. If you'd like to contribute, please take a moment
+to [read the guidelines](https://nette.org/en/contributing) in order to make
+the contribution process easy and effective for everyone involved.
+
+Thanks!
diff --git a/license.md b/license.md
index af571d5..cf741bd 100644
--- a/license.md
+++ b/license.md
@@ -21,7 +21,7 @@ If your stuff is good, it will not take long to establish a reputation for yours
 New BSD License
 ---------------
 
-Copyright (c) 2004, 2014 David Grudl (http://davidgrudl.com)
+Copyright (c) 2004, 2014 David Grudl (https://davidgrudl.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/readme.md b/readme.md
index cc205f6..63936a5 100644
--- a/readme.md
+++ b/readme.md
@@ -2,7 +2,10 @@ Nette Tokenizer
 ===============
 
 [![Downloads this Month](https://img.shields.io/packagist/dm/nette/tokenizer.svg)](https://packagist.org/packages/nette/tokenizer)
-[![Build Status](https://travis-ci.org/nette/tokenizer.svg?branch=v2.2)](https://travis-ci.org/nette/tokenizer)
+[![Build Status](https://travis-ci.org/nette/tokenizer.svg?branch=master)](https://travis-ci.org/nette/tokenizer)
+[![Coverage Status](https://coveralls.io/repos/github/nette/tokenizer/badge.svg?branch=master)](https://coveralls.io/github/nette/tokenizer?branch=master)
+[![Latest Stable Version](https://poser.pugx.org/nette/tokenizer/v/stable)](https://github.com/nette/tokenizer/releases)
+[![License](https://img.shields.io/badge/license-New%20BSD-blue.svg)](https://github.com/nette/tokenizer/blob/master/license.md)
 
 Tokenizer is a tool that uses regular expressions to split given string into tokens. What the hell is that good for, you might ask? Well, you can create your own languages! Tokenizer is used in [Latte](https://github.com/nette/latte) for example.
 
diff --git a/src/Tokenizer/TokenIterator.php b/src/Tokenizer/TokenIterator.php
index d379125..1117efa 100644
--- a/src/Tokenizer/TokenIterator.php
+++ b/src/Tokenizer/TokenIterator.php
@@ -1,19 +1,15 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Utils;
 
-use Nette;
-
 
 /**
  * Traversing helper.
- *
- * @author     David Grudl
  */
 class TokenIterator
 {
diff --git a/src/Tokenizer/Tokenizer.php b/src/Tokenizer/Tokenizer.php
index 6c0e2e3..30989e1 100644
--- a/src/Tokenizer/Tokenizer.php
+++ b/src/Tokenizer/Tokenizer.php
@@ -1,19 +1,15 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Utils;
 
-use Nette;
-
 
 /**
  * Simple lexical analyser.
- *
- * @author     David Grudl
  */
 class Tokenizer
 {
diff --git a/src/Tokenizer/TokenizerException.php b/src/Tokenizer/TokenizerException.php
index a13ca56..256decd 100644
--- a/src/Tokenizer/TokenizerException.php
+++ b/src/Tokenizer/TokenizerException.php
@@ -1,19 +1,12 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- *
- * Copyright (c) 2004, 2011 David Grudl (http://davidgrudl.com)
- *
- * For the full copyright and license information, please view
- * the file license.txt that was distributed with this source code.
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Utils;
 
-use Nette;
-
-
 
 /**
  * The exception that indicates tokenizer error.
diff --git a/tests/.coveralls.yml b/tests/.coveralls.yml
new file mode 100644
index 0000000..82764a3
--- /dev/null
+++ b/tests/.coveralls.yml
@@ -0,0 +1,4 @@
+# for php-coveralls
+service_name: travis-ci
+coverage_clover: coverage.xml
+json_path: coverage.json
diff --git a/tests/Tokenizer/TokenIterator.join.phpt b/tests/Tokenizer/TokenIterator.join.phpt
index f63124b..c141c26 100644
--- a/tests/Tokenizer/TokenIterator.join.phpt
+++ b/tests/Tokenizer/TokenIterator.join.phpt
@@ -4,15 +4,15 @@
  * Test: Nette\Utils\TokenIterator traversing
  */
 
-use Nette\Utils\Tokenizer,
-	Nette\Utils\TokenIterator,
-	Tester\Assert;
+use Nette\Utils\Tokenizer;
+use Nette\Utils\TokenIterator;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-test(function() {
+test(function () {
 	$tokenizer = new Tokenizer(array(
 		T_DNUMBER => '\d+',
 		T_WHITESPACE => '\s+',
@@ -21,81 +21,81 @@ test(function() {
 	$traverser = new TokenIterator($tokenizer->tokenize('say 123'));
 	$traverser->ignored[] = T_WHITESPACE;
 
-	Assert::same( -1, $traverser->position );
-	Assert::same( 'say', $traverser->nextValue() );
-	Assert::same( 0, $traverser->position );
+	Assert::same(-1, $traverser->position);
+	Assert::same('say', $traverser->nextValue());
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::null( $traverser->nextValue(T_DNUMBER) );
-	Assert::same( -1, $traverser->position );
-	Assert::same( 'say', $traverser->nextValue(T_STRING) );
-	Assert::same( 0, $traverser->position );
+	Assert::null($traverser->nextValue(T_DNUMBER));
+	Assert::same(-1, $traverser->position);
+	Assert::same('say', $traverser->nextValue(T_STRING));
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::same( '', $traverser->joinAll(T_DNUMBER) );
-	Assert::same( -1, $traverser->position );
-	Assert::same( 'say', $traverser->joinAll(T_STRING) );
-	Assert::same( 0, $traverser->position );
+	Assert::same('', $traverser->joinAll(T_DNUMBER));
+	Assert::same(-1, $traverser->position);
+	Assert::same('say', $traverser->joinAll(T_STRING));
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::same( '', $traverser->joinUntil(T_STRING) );
-	Assert::same( -1, $traverser->position );
-	Assert::same( 'say', $traverser->joinUntil(T_WHITESPACE) );
-	Assert::same( 0, $traverser->position );
+	Assert::same('', $traverser->joinUntil(T_STRING));
+	Assert::same(-1, $traverser->position);
+	Assert::same('say', $traverser->joinUntil(T_WHITESPACE));
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::same( -1, $traverser->position );
-	Assert::same( 'say ', $traverser->joinUntil(T_DNUMBER) );
-	Assert::same( 1, $traverser->position );
+	Assert::same(-1, $traverser->position);
+	Assert::same('say ', $traverser->joinUntil(T_DNUMBER));
+	Assert::same(1, $traverser->position);
 
 
 	$traverser->position = 0;
-	Assert::null( $traverser->nextValue(T_STRING) );
-	Assert::same( 0, $traverser->position );
-	Assert::same( '123', $traverser->nextValue(T_STRING, T_DNUMBER) );
-	Assert::same( 2, $traverser->position );
+	Assert::null($traverser->nextValue(T_STRING));
+	Assert::same(0, $traverser->position);
+	Assert::same('123', $traverser->nextValue(T_STRING, T_DNUMBER));
+	Assert::same(2, $traverser->position);
 
 	$traverser->position = 0;
-	Assert::same( '', $traverser->joinAll(T_STRING) );
-	Assert::same( 0, $traverser->position );
-	Assert::same( '123', $traverser->joinAll(T_STRING, T_DNUMBER) );
-	Assert::same( 2, $traverser->position );
+	Assert::same('', $traverser->joinAll(T_STRING));
+	Assert::same(0, $traverser->position);
+	Assert::same('123', $traverser->joinAll(T_STRING, T_DNUMBER));
+	Assert::same(2, $traverser->position);
 
 	$traverser->position = 0;
-	Assert::same( '', $traverser->joinUntil(T_WHITESPACE) );
-	Assert::same( 0, $traverser->position );
-	Assert::same( ' ', $traverser->joinUntil(T_STRING, T_DNUMBER) );
-	Assert::same( 1, $traverser->position );
+	Assert::same('', $traverser->joinUntil(T_WHITESPACE));
+	Assert::same(0, $traverser->position);
+	Assert::same(' ', $traverser->joinUntil(T_STRING, T_DNUMBER));
+	Assert::same(1, $traverser->position);
 
 
 	$traverser->position = 2;
-	Assert::null( $traverser->nextValue() );
-	Assert::same( 3, $traverser->position );
+	Assert::null($traverser->nextValue());
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
-	Assert::null( $traverser->nextValue() );
-	Assert::null( $traverser->nextValue(T_STRING, T_DNUMBER, T_WHITESPACE) );
-	Assert::same( 3, $traverser->position );
+	Assert::null($traverser->nextValue());
+	Assert::null($traverser->nextValue(T_STRING, T_DNUMBER, T_WHITESPACE));
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
-	Assert::same( '', $traverser->joinAll() );
-	Assert::same( '', $traverser->joinAll(T_STRING, T_DNUMBER, T_WHITESPACE) );
-	Assert::same( 3, $traverser->position );
+	Assert::same('', $traverser->joinAll());
+	Assert::same('', $traverser->joinAll(T_STRING, T_DNUMBER, T_WHITESPACE));
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
-	Assert::same( '', $traverser->joinUntil(T_STRING, T_DNUMBER, T_WHITESPACE) );
-	Assert::same( 2, $traverser->position );
+	Assert::same('', $traverser->joinUntil(T_STRING, T_DNUMBER, T_WHITESPACE));
+	Assert::same(2, $traverser->position);
 });
 
 
-test(function() {
+test(function () {
 	$tokenizer = new Tokenizer(array(
 		'\d+',
 		'\s+',
 		'\w+',
 	));
 	$traverser = new TokenIterator($tokenizer->tokenize('say 123'));
-	Assert::null( $traverser->nextValue('s') );
-	Assert::same( 'say', $traverser->nextValue('say') );
-	Assert::same( ' ', $traverser->nextValue() );
+	Assert::null($traverser->nextValue('s'));
+	Assert::same('say', $traverser->nextValue('say'));
+	Assert::same(' ', $traverser->nextValue());
 });
diff --git a/tests/Tokenizer/TokenIterator.traversing.phpt b/tests/Tokenizer/TokenIterator.traversing.phpt
index 77a30e2..b79afb4 100644
--- a/tests/Tokenizer/TokenIterator.traversing.phpt
+++ b/tests/Tokenizer/TokenIterator.traversing.phpt
@@ -4,15 +4,15 @@
  * Test: Nette\Utils\TokenIterator traversing
  */
 
-use Nette\Utils\Tokenizer,
-	Nette\Utils\TokenIterator,
-	Tester\Assert;
+use Nette\Utils\Tokenizer;
+use Nette\Utils\TokenIterator;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-test(function() {
+test(function () {
 	$tokenizer = new Tokenizer(array(
 		T_DNUMBER => '\d+',
 		T_WHITESPACE => '\s+',
@@ -20,28 +20,28 @@ test(function() {
 	));
 	$traverser = new TokenIterator($tokenizer->tokenize('say 123'));
 
-	Assert::false( $traverser->isPrev() );
-	Assert::true( $traverser->isNext() );
-	Assert::same( array(), $traverser->nextAll(T_DNUMBER) );
-	Assert::same( array(
+	Assert::false($traverser->isPrev());
+	Assert::true($traverser->isNext());
+	Assert::same(array(), $traverser->nextAll(T_DNUMBER));
+	Assert::same(array(
 		array('say', 0, T_STRING),
 		array(' ', 3, T_WHITESPACE),
-	), $traverser->nextUntil(T_DNUMBER) );
-	Assert::true( $traverser->isCurrent(T_WHITESPACE) );
-	Assert::true( $traverser->isPrev() );
-	Assert::true( $traverser->isNext() );
-	Assert::true( $traverser->isPrev(T_STRING) );
-	Assert::false( $traverser->isPrev(T_DNUMBER) );
-	Assert::true( $traverser->isNext(T_DNUMBER) );
-	Assert::true( $traverser->isNext(T_STRING, T_DNUMBER) );
-	Assert::same( array(), $traverser->nextUntil(T_STRING, T_DNUMBER, T_WHITESPACE) );
-	Assert::same( array(array('123', 4, T_DNUMBER)), $traverser->nextAll() );
-	Assert::true( $traverser->isPrev() );
-	Assert::false( $traverser->isNext() );
+	), $traverser->nextUntil(T_DNUMBER));
+	Assert::true($traverser->isCurrent(T_WHITESPACE));
+	Assert::true($traverser->isPrev());
+	Assert::true($traverser->isNext());
+	Assert::true($traverser->isPrev(T_STRING));
+	Assert::false($traverser->isPrev(T_DNUMBER));
+	Assert::true($traverser->isNext(T_DNUMBER));
+	Assert::true($traverser->isNext(T_STRING, T_DNUMBER));
+	Assert::same(array(), $traverser->nextUntil(T_STRING, T_DNUMBER, T_WHITESPACE));
+	Assert::same(array(array('123', 4, T_DNUMBER)), $traverser->nextAll());
+	Assert::true($traverser->isPrev());
+	Assert::false($traverser->isNext());
 });
 
 
-test(function() {
+test(function () {
 	$tokenizer = new Tokenizer(array(
 		T_DNUMBER => '\d+',
 		T_WHITESPACE => '\s+',
@@ -50,85 +50,85 @@ test(function() {
 	$traverser = new TokenIterator($tokenizer->tokenize('say 123'));
 	$traverser->ignored[] = T_WHITESPACE;
 
-	Assert::same( -1, $traverser->position );
-	Assert::same( array('say', 0, T_STRING), $traverser->nextToken() );
-	Assert::same( 0, $traverser->position );
+	Assert::same(-1, $traverser->position);
+	Assert::same(array('say', 0, T_STRING), $traverser->nextToken());
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::null( $traverser->nextToken(T_DNUMBER) );
-	Assert::same( -1, $traverser->position );
-	Assert::same( array('say', 0, T_STRING), $traverser->nextToken(T_STRING) );
-	Assert::same( 0, $traverser->position );
+	Assert::null($traverser->nextToken(T_DNUMBER));
+	Assert::same(-1, $traverser->position);
+	Assert::same(array('say', 0, T_STRING), $traverser->nextToken(T_STRING));
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::same( array(), $traverser->nextAll(T_DNUMBER) );
-	Assert::same( -1, $traverser->position );
-	Assert::same( array(array('say', 0, T_STRING)), $traverser->nextAll(T_STRING) );
-	Assert::same( 0, $traverser->position );
+	Assert::same(array(), $traverser->nextAll(T_DNUMBER));
+	Assert::same(-1, $traverser->position);
+	Assert::same(array(array('say', 0, T_STRING)), $traverser->nextAll(T_STRING));
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::same( array(), $traverser->nextUntil(T_STRING) );
-	Assert::same( -1, $traverser->position );
-	Assert::same( array(array('say', 0, T_STRING)), $traverser->nextUntil(T_WHITESPACE) );
-	Assert::same( 0, $traverser->position );
+	Assert::same(array(), $traverser->nextUntil(T_STRING));
+	Assert::same(-1, $traverser->position);
+	Assert::same(array(array('say', 0, T_STRING)), $traverser->nextUntil(T_WHITESPACE));
+	Assert::same(0, $traverser->position);
 
 	$traverser->position = -1;
-	Assert::same( -1, $traverser->position );
-	Assert::same( array(
+	Assert::same(-1, $traverser->position);
+	Assert::same(array(
 		array('say', 0, T_STRING),
 		array(' ', 3, T_WHITESPACE),
-	), $traverser->nextUntil(T_DNUMBER) );
-	Assert::same( 1, $traverser->position );
+	), $traverser->nextUntil(T_DNUMBER));
+	Assert::same(1, $traverser->position);
 
 
 	$traverser->position = 0;
-	Assert::null( $traverser->nextToken(T_STRING) );
-	Assert::same( 0, $traverser->position );
-	Assert::same( array('123', 4, T_DNUMBER), $traverser->nextToken(T_STRING, T_DNUMBER) );
-	Assert::same( 2, $traverser->position );
+	Assert::null($traverser->nextToken(T_STRING));
+	Assert::same(0, $traverser->position);
+	Assert::same(array('123', 4, T_DNUMBER), $traverser->nextToken(T_STRING, T_DNUMBER));
+	Assert::same(2, $traverser->position);
 
 	$traverser->position = 0;
-	Assert::same( array(), $traverser->nextAll(T_STRING) );
-	Assert::same( 0, $traverser->position );
-	Assert::same( array(array('123', 4, T_DNUMBER)), $traverser->nextAll(T_STRING, T_DNUMBER) );
-	Assert::same( 2, $traverser->position );
+	Assert::same(array(), $traverser->nextAll(T_STRING));
+	Assert::same(0, $traverser->position);
+	Assert::same(array(array('123', 4, T_DNUMBER)), $traverser->nextAll(T_STRING, T_DNUMBER));
+	Assert::same(2, $traverser->position);
 
 	$traverser->position = 0;
-	Assert::same( array(), $traverser->nextUntil(T_WHITESPACE) );
-	Assert::same( 0, $traverser->position );
-	Assert::same( array(array(' ', 3, T_WHITESPACE)), $traverser->nextUntil(T_STRING, T_DNUMBER) );
-	Assert::same( 1, $traverser->position );
+	Assert::same(array(), $traverser->nextUntil(T_WHITESPACE));
+	Assert::same(0, $traverser->position);
+	Assert::same(array(array(' ', 3, T_WHITESPACE)), $traverser->nextUntil(T_STRING, T_DNUMBER));
+	Assert::same(1, $traverser->position);
 
 
 	$traverser->position = 2;
-	Assert::null( $traverser->nextToken() );
-	Assert::null( $traverser->nextToken() );
-	Assert::same( 3, $traverser->position );
+	Assert::null($traverser->nextToken());
+	Assert::null($traverser->nextToken());
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
-	Assert::null( $traverser->nextToken() );
-	Assert::null( $traverser->nextToken(T_STRING, T_DNUMBER, T_WHITESPACE) );
-	Assert::same( 3, $traverser->position );
+	Assert::null($traverser->nextToken());
+	Assert::null($traverser->nextToken(T_STRING, T_DNUMBER, T_WHITESPACE));
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
-	Assert::same( array(), $traverser->nextAll() );
-	Assert::same( array(), $traverser->nextAll(T_STRING, T_DNUMBER, T_WHITESPACE) );
-	Assert::same( 3, $traverser->position );
+	Assert::same(array(), $traverser->nextAll());
+	Assert::same(array(), $traverser->nextAll(T_STRING, T_DNUMBER, T_WHITESPACE));
+	Assert::same(3, $traverser->position);
 
 	$traverser->position = 2;
-	Assert::same( array(), $traverser->nextUntil(T_STRING, T_DNUMBER, T_WHITESPACE) );
-	Assert::same( 2, $traverser->position );
+	Assert::same(array(), $traverser->nextUntil(T_STRING, T_DNUMBER, T_WHITESPACE));
+	Assert::same(2, $traverser->position);
 });
 
 
-test(function() {
+test(function () {
 	$tokenizer = new Tokenizer(array(
 		'\d+',
 		'\s+',
 		'\w+',
 	));
 	$traverser = new TokenIterator($tokenizer->tokenize('say 123'));
-	Assert::null( $traverser->nextToken('s') );
-	Assert::same( array('say', 0), $traverser->nextToken('say') );
-	Assert::same( array(' ', 3), $traverser->nextToken() );
+	Assert::null($traverser->nextToken('s'));
+	Assert::same(array('say', 0), $traverser->nextToken('say'));
+	Assert::same(array(' ', 3), $traverser->nextToken());
 });
diff --git a/tests/Tokenizer/Tokenizer.getCoordinates.phpt b/tests/Tokenizer/Tokenizer.getCoordinates.phpt
index 9d19352..fcc03bc 100644
--- a/tests/Tokenizer/Tokenizer.getCoordinates.phpt
+++ b/tests/Tokenizer/Tokenizer.getCoordinates.phpt
@@ -4,14 +4,14 @@
  * Test: Nette\Utils\Tokenizer::getCoordinates
  */
 
-use Nette\Utils\Tokenizer,
-	Tester\Assert;
+use Nette\Utils\Tokenizer;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::same( array(1, 1), Tokenizer::getCoordinates("say \n123", 0));
-Assert::same( array(1, 2), Tokenizer::getCoordinates("say \n123", 1));
-Assert::same( array(1, 5), Tokenizer::getCoordinates("say \n123", 4));
-Assert::same( array(2, 1), Tokenizer::getCoordinates("say \n123", 5));
+Assert::same(array(1, 1), Tokenizer::getCoordinates("say \n123", 0));
+Assert::same(array(1, 2), Tokenizer::getCoordinates("say \n123", 1));
+Assert::same(array(1, 5), Tokenizer::getCoordinates("say \n123", 4));
+Assert::same(array(2, 1), Tokenizer::getCoordinates("say \n123", 5));
diff --git a/tests/Tokenizer/Tokenizer.namedTokens.phpt b/tests/Tokenizer/Tokenizer.namedTokens.phpt
index 34ebdc5..14287aa 100644
--- a/tests/Tokenizer/Tokenizer.namedTokens.phpt
+++ b/tests/Tokenizer/Tokenizer.namedTokens.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Utils\Tokenizer::tokenize with names
  */
 
-use Nette\Utils\Tokenizer,
-	Tester\Assert;
+use Nette\Utils\Tokenizer;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -17,12 +17,12 @@ $tokenizer = new Tokenizer(array(
 	T_STRING => '\w+',
 ));
 $tokens = $tokenizer->tokenize("say \n123");
-Assert::same( array(
+Assert::same(array(
 	array(Tokenizer::VALUE => 'say', Tokenizer::OFFSET => 0, Tokenizer::TYPE => T_STRING),
 	array(Tokenizer::VALUE => " \n", Tokenizer::OFFSET => 3, Tokenizer::TYPE => T_WHITESPACE),
 	array(Tokenizer::VALUE => '123', Tokenizer::OFFSET => 5, Tokenizer::TYPE => T_DNUMBER),
-), $tokens );
+), $tokens);
 
-Assert::exception(function() use ($tokenizer) {
+Assert::exception(function () use ($tokenizer) {
 	$tokenizer->tokenize('say 123;');
 }, 'Nette\Utils\TokenizerException', "Unexpected ';' on line 1, column 8.");
diff --git a/tests/Tokenizer/Tokenizer.simple.phpt b/tests/Tokenizer/Tokenizer.simple.phpt
index b2f54bc..889bf13 100644
--- a/tests/Tokenizer/Tokenizer.simple.phpt
+++ b/tests/Tokenizer/Tokenizer.simple.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\Utils\Tokenizer::tokenize simple
  */
 
-use Nette\Utils\Tokenizer,
-	Tester\Assert;
+use Nette\Utils\Tokenizer;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -17,12 +17,12 @@ $tokenizer = new Tokenizer(array(
 	'\w+',
 ));
 $tokens = $tokenizer->tokenize('say 123');
-Assert::same( array(
+Assert::same(array(
 	array('say', 0),
 	array(' ', 3),
 	array('123', 4),
-), $tokens );
+), $tokens);
 
-Assert::exception(function() use ($tokenizer) {
+Assert::exception(function () use ($tokenizer) {
 	$tokenizer->tokenize('say 123;');
 }, 'Nette\Utils\TokenizerException', "Unexpected ';' on line 1, column 8.");
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 85f7726..e333db3 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,7 +4,7 @@
 // invoked through the command: ../vendor/bin/tester .
 
 if (@!include __DIR__ . '/../vendor/autoload.php') {
-	echo 'Install Nette Tester using `composer update --dev`';
+	echo 'Install Nette Tester using `composer install`';
 	exit(1);
 }
 
diff --git a/tests/php-unix.ini b/tests/php-unix.ini
deleted file mode 100644
index 27f8a41..0000000
--- a/tests/php-unix.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[PHP]
-
-[Zend]
-;zend_extension="./ext/zend_extension"
diff --git a/tests/php-win.ini b/tests/php-win.ini
deleted file mode 100644
index 5839751..0000000
--- a/tests/php-win.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[PHP]
-extension_dir = "./ext"
-
-[Zend]
-;zend_extension="./ext/php_xdebug-2.0.5-5.3-vc6.dll"