Some test tweaks
Fix a bug where vector writebacks to v31 would trigger a branch