Fixes to make SelectionPageModel tests work