split up test cases
add support for fixing headers