tests + cleanup
routing