Update test
Merge branch 'master' of https://github.com/revollat/tests

Conflicts:
	doc/test