Second go at fixing flakey spec