Add functional tests to yml

Conflicts:
	.travis.yml