Fix a couple masks and remove duplication in http2 test