Fixing travis tests

This pull request is work in progress.