Prettied up directory tests

Prettied up directory tests