fixed tests
refactored Config to make Router work