modified configuration singleton and added tests