Got test vectors working again