Fix spec

Rewrite test to be simpler and work
Fix widget count spec

Were widgets really removed though?