cleanup tests; fix router