Added unit test for additional directory code
Completed user provided folder support