Optionals madness in tests
update test vectors