hopefully fixed tests on travis-ci
noted some changes