Tidy up tests
Reach 100% coverage
Code style
Multiple dirs tests
Fix multiple dirs when number of files diverges
Increase coverage!
100% coverage!