Updates to test vector code