move header to request
update unit tests