minor refactoring
Adding tests verifying header values