Added headers tests and code