more test fixes
more test fixes

softwords/plottable,NextTuesday/plottable,palantir/plottable,iobeam/plottable,NextTuesday/plottable,palantir/plottable,iobeam/plottable,softwords/plottable,softwords/plottable,palantir/plottable,iobeam/plottable,NextTuesday/plottable,palantir/plottable