Inadvertently rethrown an exception, removed

Also made exception catches more specific
Run unit and integation tests separately in Travis

If the integration test times out (server download takes too long) you can still check whether the unit tests passed.