Rename "test-conflictless" to "test-unconflicted".

I have typed it wrong several times now so it seems to want its
new name.
Merge branch 'test-dirs'

Manage the directories used by the tests better.