Add corrected BIP-21 vectors to tests, adjust uri tests for recent changes.