This will also conflict with https://github.com/mozilla/oneanddone-tests/pull/2/files#diff-8ff76a9e9b9bb851fdf0157ea1f18058R17