Improved support for single-box widgets (#2530076)
Uncommented tests covering newly introduced functionality