Fix the unit-tests
- Fix style error from code removed where imports are no longer needed
- Fix the data returned by the internal API when we moving calculating
the diff of branches to a worker
- Fix tests with the ordering of the flags returned
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr></pingou@pingoured.fr>