remove obsolete tests and add missing router replacement