Fixed travis tests after refactoring

Paired by Michael and Richard
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.travis.yml
Fixed travis tests after refactoring

Paired by Michael and Richard