Fixes for test vectors