Start splitting out headers for testing