7c76d2c had some problems with multi-field test vectors. This
should do the trick.