Fixing unit/test2
Adding in the merge conflicts for the fixing of test2