Small experiment, fix inconsistently failing test