Final changes on bwa tests-> ALL OK