17.1 refactoring, UserControlelr tests