Converting static method to non-static in Configuration.
Fixing unit tests.