Fix tests so that having ECC disabled works as well. Fix define protection for Draft 18 and HRR Cookie.