Small refactoring of names
Added a test to verify encryption with host
commented out baseconfigdirectory