added tests and new routs