Could you please update unit tests as well? seems CSPHandlerTest::NoCSP results are affected by this change.