Fix to test vector generation