Update of bwa test, v2