Is it worth adding a third tenant here that checks that nothing happens when MediaCore hasn't been configured? This might already be covered elsewhere though.