Merge "Test vector mismatch fix"