diff --git a/.gitignore b/.gitignore
index 6f76849e..48fe42f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 .idea/*
 cmake-*
 build*
+asan_build*
 po/POTFILES
 po/remove-potcdate.sed
 po/stamp-po
diff --git a/test/addmoddel.sh b/test/addmoddel.sh
index 47a6fdb8..d99a3ceb 100755
--- a/test/addmoddel.sh
+++ b/test/addmoddel.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver to run the addmoddel sample program
 source ./functions.source
 
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index cdafa9a1..cb52bcdb 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver with regression tests for bugfixes
 
 source ./functions.source
diff --git a/test/conversions.sh b/test/conversions.sh
index 5b50d005..fdab592f 100755
--- a/test/conversions.sh
+++ b/test/conversions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # XMP parser test driver
 
 # ----------------------------------------------------------------------
@@ -207,11 +207,11 @@ fi
     platform=$(runTest exiv2 -vV 2>/dev/null | grep platform=)
     if [ "$platform" == "platform=windows" ]; then
         runTest exiv2 -PEkycv v.jpg | sed -E -e 's#17 19:10:22#18 02:10:22#g'
-    else 
+    else
         runTest exiv2 -PEkycv v.jpg
     fi
     runTest exiv2 -pi v.jpg
-    
+
     # 16) https://github.com/Exiv2/exiv2/issues/521
     echo
     echo Testcase 16
diff --git a/test/crw-test.sh b/test/crw-test.sh
index 64ca5222..55da56c4 100755
--- a/test/crw-test.sh
+++ b/test/crw-test.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
 # Test driver for CRW file operations
 
 source ./functions.source
diff --git a/test/curliotest.sh b/test/curliotest.sh
index 96d37c08..8ae818f2 100755
--- a/test/curliotest.sh
+++ b/test/curliotest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for CurlIO
 
 source ./functions.source
@@ -76,7 +76,7 @@ RemoteIOTest()
         if [[ "$USE_CURL" == *http* ]]; then
             # test connection
             printf 'http test connection '
-            TEST_CON=$("$bin"/conntest http://$EXIV2_AWSUBUNTU_HOST/$testfile) 
+            TEST_CON=$("$bin"/conntest http://$EXIV2_AWSUBUNTU_HOST/$testfile)
             if [[ "$TEST_CON" == OK* ]]; then
                 errors=0
                 printf 'OK\nHTTP  IO '
diff --git a/test/eps-preview-test.sh b/test/eps-preview-test.sh
index 74d603e3..6aca56cb 100755
--- a/test/eps-preview-test.sh
+++ b/test/eps-preview-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for previews
 
 source ./functions.source
diff --git a/test/eps-test.sh b/test/eps-test.sh
index 0b30e634..ceb3ebb7 100755
--- a/test/eps-test.sh
+++ b/test/eps-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for EPS files
 
 source ./functions.source
diff --git a/test/exifdata-test.sh b/test/exifdata-test.sh
index 7081580f..50307ea8 100755
--- a/test/exifdata-test.sh
+++ b/test/exifdata-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for exifdata copy construction and assignment unit tests
 source ./functions.source
 
diff --git a/test/exiv2-test.sh b/test/exiv2-test.sh
index cf7182c4..76ce179e 100755
--- a/test/exiv2-test.sh
+++ b/test/exiv2-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for exiv2 utility tests
 
 source ./functions.source
diff --git a/test/geotag-test.sh b/test/geotag-test.sh
index d08a14c3..f16923f7 100755
--- a/test/geotag-test.sh
+++ b/test/geotag-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for geotag
 
 source ./functions.source
diff --git a/test/http-test.sh b/test/http-test.sh
index eadce3a4..43c28083 100755
--- a/test/http-test.sh
+++ b/test/http-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for http/https
 
 source ./functions.source
diff --git a/test/httpiotest.sh b/test/httpiotest.sh
index 4ef6ee88..afd97724 100755
--- a/test/httpiotest.sh
+++ b/test/httpiotest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for httptest and httpIo
 
 source ./functions.source
@@ -36,12 +36,12 @@ httpIoTest()
     testfile="conntest.jpg"
     iopngfiles+=(remoteio{1..5}.png)
     iojpgfiles+=(remoteio{6..10}.jpg)
-    
+
     # test connection (basic sanity test)
     printf 'http test connection '
     TEST_CON=$("$bin"/conntest http://$EXIV2_AWSUBUNTU_HOST/$testfile)
     if [[ "$TEST_CON" == OK* ]]; then
-        #Tests for httpIo 
+        #Tests for httpIo
         printf 'OK\nHTTP IO '
         for name in ${iopngfiles[@]}; do
             httpIoTest "http://$EXIV2_AWSUBUNTU_HOST/$name"
diff --git a/test/icc-test.sh b/test/icc-test.sh
index c4a017da..32610e8a 100755
--- a/test/icc-test.sh
+++ b/test/icc-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for exiv2.exe ICC support (-pS, -pC, -eC, -iC)
 
 source ./functions.source
diff --git a/test/imagetest.sh b/test/imagetest.sh
index f3096176..a3f21108 100755
--- a/test/imagetest.sh
+++ b/test/imagetest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for image file i/o
 
 # **********************************************************************
diff --git a/test/iotest.sh b/test/iotest.sh
index 0335c6cf..daba5584 100755
--- a/test/iotest.sh
+++ b/test/iotest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for image file i/o
 
 source ./functions.source
diff --git a/test/iptctest.sh b/test/iptctest.sh
index 36e4ba9d..2221d3cb 100755
--- a/test/iptctest.sh
+++ b/test/iptctest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for Iptc metadata
 
 source ./functions.source
diff --git a/test/iso65k-test.sh b/test/iso65k-test.sh
index a2821a8a..8919ba4e 100755
--- a/test/iso65k-test.sh
+++ b/test/iso65k-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # test for ISOs which follow Annex G of EXIF 2.3 spec, i.e. ISOs,
 # which cannot be represented by Exif.Photo.ISOSpeedRatings due to
 # being larger than 65k
diff --git a/test/modify-test.sh b/test/modify-test.sh
index 41d9c989..0dbd4d22 100755
--- a/test/modify-test.sh
+++ b/test/modify-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for write unit tests to build Exif metadata from scratch
 source ./functions.source
 
diff --git a/test/path-test.sh b/test/path-test.sh
index 488031bc..c7e03a82 100755
--- a/test/path-test.sh
+++ b/test/path-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Mini test-driver for path utility functions
 source ./functions.source
 
diff --git a/test/preview-test.sh b/test/preview-test.sh
index 0dfa98a0..63019716 100755
--- a/test/preview-test.sh
+++ b/test/preview-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for previews
 
 source ./functions.source
diff --git a/test/sshiotest.sh b/test/sshiotest.sh
index 4880af1a..8388f5e1 100755
--- a/test/sshiotest.sh
+++ b/test/sshiotest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for SshIo
 
 source ./functions.source
@@ -73,7 +73,7 @@ SshIOTest()
         # test connection
         printf 'sftp test connection '
         TEST_CON=$("$bin"/conntest sftp://"$EXIV2_AWSUBUNTU_USERNAME"_sftp:$EXIV2_AWSUBUNTU_PASSWORD@$EXIV2_AWSUBUNTU_HOST/var/www/$testfile)
-        if [[ "$TEST_CON" == OK* ]]; then 
+        if [[ "$TEST_CON" == OK* ]]; then
             # SFTP protocol
             errors=0
             printf 'OK\nSFTP READ '
@@ -93,7 +93,7 @@ SshIOTest()
         # test connection
         printf 'ssh test connection '
         TEST_CON=$("$bin"/conntest ssh://$EXIV2_AWSUBUNTU_USERNAME:$EXIV2_AWSUBUNTU_PASSWORD@$EXIV2_AWSUBUNTU_HOST/sshtest/$testfile)
-        if [[ "$TEST_CON" == OK* ]]; then 
+        if [[ "$TEST_CON" == OK* ]]; then
             # SSH protocol
             errors=0
             printf 'OK\nSSH IO '
diff --git a/test/stdin-test.sh b/test/stdin-test.sh
index a016fe13..489b52c2 100755
--- a/test/stdin-test.sh
+++ b/test/stdin-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for stdin
 
 source ./functions.source
diff --git a/test/stringto-test.sh b/test/stringto-test.sh
index 220f3f0d..47376485 100755
--- a/test/stringto-test.sh
+++ b/test/stringto-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for tests of stringToLong/Float/Rational
 source ./functions.source
 
diff --git a/test/testMSVC.sh b/test/testMSVC.sh
index dd4312b6..c1b2a875 100755
--- a/test/testMSVC.sh
+++ b/test/testMSVC.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 msvc=$1
 test=$2
diff --git a/test/version-test.sh b/test/version-test.sh
index 4c6188b8..cdf92ee1 100755
--- a/test/version-test.sh
+++ b/test/version-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for exiv2.exe --verbose --version
 
 source ./functions.source
diff --git a/test/video-test.sh b/test/video-test.sh
index bda161de..57cd0a4f 100755
--- a/test/video-test.sh
+++ b/test/video-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for video files
 #
 # video-asf.wmv        http://www.educationalquestions.com/video/DLP_PART_2_768k.wmv
diff --git a/test/webp-test.sh b/test/webp-test.sh
index 9c53293c..ec66485d 100755
--- a/test/webp-test.sh
+++ b/test/webp-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for webp
 
 source ./functions.source
diff --git a/test/write-test.sh b/test/write-test.sh
index a0a0832d..f6827971 100755
--- a/test/write-test.sh
+++ b/test/write-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for the write unit tests
 
 source ./functions.source
diff --git a/test/write-video-test.sh b/test/write-video-test.sh
index 68c73ec5..b7997840 100755
--- a/test/write-video-test.sh
+++ b/test/write-video-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for write video
 
 source ./functions.source
diff --git a/test/write2-test.sh b/test/write2-test.sh
index 0aba9915..09be4da5 100755
--- a/test/write2-test.sh
+++ b/test/write2-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Test driver for write unit tests to build Exif metadata from scratch
 
 source ./functions.source
diff --git a/test/xmpparser-test.sh b/test/xmpparser-test.sh
index 36e22464..db9c7933 100755
--- a/test/xmpparser-test.sh
+++ b/test/xmpparser-test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # XMP parser test driver
 
 source ./functions.source