fix this.headers

add more test cases