adapt test config for new build path
Merge branch 'master' into cmake

* master:
  adapt test config for new build path

Conflicts:
	.travis.yml