Fixed config altering issues that was causing tests to fail.