Merge pull request #63 from mlippert/widget-refactor

some unit tests and bric factory