More tests added + some small updates.
Merge branch 'master' of https://github.com/Kajna/K

Conflicts:
	.travis.yml
	tests/phpunit.xml