Adding multi test suite to prove config dir works.
Minor code cleanup