Converting dirnames in plural to singular
Tidying up tests, raising coverage
Changing test code to use promises (mocha supported)