Update databaseTest
Merge origin/master