changed router response and fixed tests