WIP: fix tests failing on Travis