Content block testing

Covering the content block widget and the navigation widget with unit tests ~70% code coverage.
Refactoring the code in order to follow the best practices.