This widget behaviour hadn't correctly implemented with the new views. This commit also introduces some tests.