I'd love to remove at least one happypath test that uses the old protocol so we make sure not to break it before its time.