Removed BaseObserver and adapted Unittests