Comment out failing tests
Remove unused test cases.

The methods removed were testing path conflict resolution which
we don't do anymore.
Organise imports