The intellij thing is just a symptom. I think the bigger issues are the consequences of the demo being changed and that it just doesn't feel right.
In my mind, the Test code is for testing the core, not the demo. The demo, in my mind is a sample application using the core and has nothing to do with testing the core. To me the demo feels more akin to the contrib area then the core area and I think you would agree that the core tests should not be depend on anything in contrib, right?
At any rate, I am not trying to create an aesthetics war here, so at this point I will leave it to the committers to decide.