more tests, support for non-recurring events and rolled back previous refactoring in sidebar-view