Improved UserControl coverage