fixes for latest widget system
improving test