Merge of the new automated unit tests branch