Fix tests affected by `rose bush` changes