fix for linux + changes for tests on travis