Finalisation of the bwa tests code