cleans up and adds tests to selection pages
Merge branch 'feature/selection_pages_improvements' into develop