added more tests + routes