Fixed: Tests after refactoring.
Fixed: Split up Travis test commands.

This should hopefully fix that travis calls a build successful even if
PHPUnit fails.