Modified the Configuration Class a bit
Configuration class passes the tests now...