Merge testing into sprint-1