Fix up tests for htslib architecture