Unit test fixes, works locally.
We'll see if it finally runs on Travis...