No need for strict mode in tests
Clean up the HSTS code a little bit