ApplicationConfig -> Configuration, refactor Test classes