clean up some tests, fix samtools read count