Modifying tests in floBranch
Solving conflicts