Merge unit tests with the master
Fix merge of overall branches