changed routing and tests