Test infrastructure and header validation added