Fix test
Merge branch 'cake3' of git://github.com/dereuromark/cakephp-setup into cake3x

Conflicts:
	src/Shell/ResetShell.php
test