Merging test and master branches