removed obsolete listenToResync functionality
some fixes in the unit tests