Updated tests and router