Rewrite Widget Test– Expand