Blink improve selection widgets

Simpler way of fixing the tests.