Fixed travis tests after refactoring

Paired by Michael and Richard