Refactored CDN headers and test classes