fixed tests, updated travis conf