Fix a couple masks and remove duplication in http2 test

we could use the 170lines for something else