Fix failing test
experimental changes regarding running change detection asynchronously. This approach has some problems, because async means no context is available and a lot of logic re requires it
fix merge conflicts