Improve tests and implemented route tests