Fix issue with creation of test database
Merge branch 'release/0.1.18'