Changes to add Test and use Config Management