Unit tests

Some updates for .travis.yml and fixes for the unit-tests.