Modified config to use new utility functions and added tests.