added test clutter widget
speedup build a bit