[WIP] Fixing tests so we're green in travis