Return router tests
Revert "Return model tests"

This reverts commit 1cb46df602f92c0e5651a3f48e659c358b1a2866.